Skip to content

ZOOKEEPER-5045: Fall back to TLSv1.2 default in FIPS mode - #2383

Merged
anmolnar merged 1 commit into
apache:branch-3.9from
PDavid:ZOOKEEPER-5045-branch-3.9
Jun 22, 2026
Merged

ZOOKEEPER-5045: Fall back to TLSv1.2 default in FIPS mode#2383
anmolnar merged 1 commit into
apache:branch-3.9from
PDavid:ZOOKEEPER-5045-branch-3.9

Conversation

@PDavid

@PDavid PDavid commented May 7, 2026

Copy link
Copy Markdown
Contributor

Reviewers: meszibalu
Author: PDavid
Closes #2380 from PDavid/ZOOKEEPER-5045

(cherry picked from commit d4e15d3)

@PDavid

PDavid commented May 7, 2026

Copy link
Copy Markdown
Contributor Author

This is the backport of #2380 to branch-3.9. Cherry-picked the d4e15d3 commit but it did not applied cleanly. Had to resolve a small conflict in X509Util. Also had to fix ClientX509Util a bit.

@PDavid

PDavid commented May 8, 2026

Copy link
Copy Markdown
Contributor Author

Some tests in SSLHostnameVerificationTest failed. I'll have a look.

@PDavid
PDavid marked this pull request as ready for review May 8, 2026 12:09
@PDavid

PDavid commented May 8, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

FYI: We miss this patch on this (3.9) branch: https://issues.apache.org/jira/browse/ZOOKEEPER-4912

To be honest I'm not sure if we need that patch in 3.9 or not. Just it is related.

For fixing SSLHostnameVerificationTest I now patched ClientX509Util.getEnabledProtocols the same way:

9aae22e

@anmolnar

anmolnar commented May 12, 2026

Copy link
Copy Markdown
Contributor

Thanks @PDavid for the contribution.
What if we backport ZOOKEEPER-4912 first?
Sounds like something that we should consider, because according to the Jira ticket it fixes problems in 3.9 too.

@PDavid

PDavid commented May 13, 2026

Copy link
Copy Markdown
Contributor Author

Thanks @PDavid for the contribution. What if we backport ZOOKEEPER-4912 first? Sounds like something that we should consider, because according to the Jira ticket it fixes problems in 3.9 too.

Thanks, sure, makes sense. Here it is:
#2386

@anmolnar

anmolnar commented Jun 18, 2026

Copy link
Copy Markdown
Contributor

@PDavid #2386 is merged now. Please rebase this patch.

@PDavid
ZOOKEEPER-5045: Fall back to TLSv1.2 default in FIPS mode
45ed547 
Reviewers: meszibalu
Author: PDavid
Closes apache#2380 from PDavid/ZOOKEEPER-5045

(cherry picked from commit d4e15d3)
@PDavid
PDavid force-pushed the ZOOKEEPER-5045-branch-3.9 branch from 9aae22e to 45ed547 Compare June 22, 2026 07:57
@PDavid

PDavid commented Jun 22, 2026

Copy link
Copy Markdown
Contributor Author

@PDavid #2386 is merged now. Please rebase this patch.

Thanks for the heads-up, I rebased this patch.

@anmolnar
anmolnar merged commit f6fb668 into apache:branch-3.9 Jun 22, 2026
13 checks passed
@anmolnar

anmolnar commented Jun 22, 2026

Copy link
Copy Markdown
Contributor

Merged. Thanks @PDavid and @meszibalu !

@PDavid
PDavid deleted the ZOOKEEPER-5045-branch-3.9 branch June 23, 2026 06:39
@PDavid

PDavid commented Jun 23, 2026

Copy link
Copy Markdown
Contributor Author

Many thanks @meszibalu and @anmolnar !

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer
@meszibalu meszibalu meszibalu approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@PDavid @anmolnar @meszibalu